From: Kenichi Handa <handa@m17n.org>
Date: Mon, 21 Nov 2011 01:25:22 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1304^2~22
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=aa1558e4df6e84c2a94e1e63673c244ddd9500d1;p=emacs.git

merge trunk
---

aa1558e4df6e84c2a94e1e63673c244ddd9500d1
diff --cc lisp/emacs-lisp/eieio.el
index f1fe9594fc0,352bd245ba4..2975ba7cc68
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@@ -3051,7 -3051,7 +3051,7 @@@ Optional argument GROUP is the sub-grou
  
  ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic
  ;;;;;;  eieio-describe-constructor eieio-describe-class eieio-browse)
--;;;;;;  "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f")
++;;;;;;  "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2")
  ;;; Generated autoloads from eieio-opt.el
  
  (autoload 'eieio-browse "eieio-opt" "\
diff --cc lisp/mail/rmail.el
index 4b3441a8cdc,76c9b87f881..34ad7c09621
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4599,7 -4601,7 +4601,7 @@@ If prefix argument REVERSE is non-nil, 
  
  ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
  ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
--;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "3817e21639db697abe5832d3223ecfc2")
++;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "4d1366228363803cd5b4fc60e7ad469e")
  ;;; Generated autoloads from rmailsum.el
  
  (autoload 'rmail-summary "rmailsum" "\